From c2e437d3115e485414122bb16618947a3a2dc162 Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Tue, 27 Oct 2020 22:38:20 +0100 Subject: [PATCH] Add buildable vtk9 --- debian/changelog | 2 +- debian/control | 148 +++++------------- debian/libvtk8-dev.install | 21 --- debian/libvtk8-dev.lintian-overrides | 4 - debian/libvtk8-java.install | 3 - debian/libvtk8-java.lintian-overrides | 3 - debian/libvtk8-jni.lintian-overrides | 1 - debian/libvtk8-qt-dev.install | 6 - debian/libvtk8-qt-dev.lintian-overrides | 4 - debian/libvtk8-qt.install | 1 - debian/libvtk8-qt.lintian-overrides | 3 - debian/libvtk8.lintian-overrides | 5 - debian/libvtk9-dev.install | 4 + debian/libvtk9-java.install | 4 + ...ibvtk8-jni.install => libvtk9-jni.install} | 0 debian/{libvtk8.install => libvtk9.install} | 0 .../110_do_not_link_against_socket.patch | 10 +- debian/patches/30_matplotlib.patch | 8 +- debian/patches/drop_medical_example.patch | 58 +++++++ debian/patches/libharu_version.patch | 68 ++++++++ debian/patches/series | 19 +-- debian/python3-vtk8.lintian-overrides | 4 - ...hon3-vtk8.install => python3-vtk9.install} | 0 debian/rules | 87 ++++------ debian/tcl-vtk8.install | 3 - debian/tcl-vtk8.lintian-overrides | 3 - debian/tests/control | 2 +- debian/vtk8-doc.docs | 2 - debian/vtk8-doc.links | 1 - debian/vtk8.install | 3 - debian/vtk8.lintian-overrides | 3 - debian/vtk9-doc.docs | 2 + debian/vtk9-doc.links | 1 + ...amples.examples => vtk9-examples.examples} | 0 debian/vtk9.install | 1 + 35 files changed, 232 insertions(+), 252 deletions(-) delete mode 100644 debian/libvtk8-dev.install delete mode 100644 debian/libvtk8-dev.lintian-overrides delete mode 100644 debian/libvtk8-java.install delete mode 100644 debian/libvtk8-java.lintian-overrides delete mode 100644 debian/libvtk8-jni.lintian-overrides delete mode 100644 debian/libvtk8-qt-dev.install delete mode 100644 debian/libvtk8-qt-dev.lintian-overrides delete mode 100644 debian/libvtk8-qt.install delete mode 100644 debian/libvtk8-qt.lintian-overrides delete mode 100644 debian/libvtk8.lintian-overrides create mode 100644 debian/libvtk9-dev.install create mode 100644 debian/libvtk9-java.install rename debian/{libvtk8-jni.install => libvtk9-jni.install} (100%) rename debian/{libvtk8.install => libvtk9.install} (100%) create mode 100644 debian/patches/drop_medical_example.patch create mode 100644 debian/patches/libharu_version.patch delete mode 100644 debian/python3-vtk8.lintian-overrides rename debian/{python3-vtk8.install => python3-vtk9.install} (100%) delete mode 100644 debian/tcl-vtk8.install delete mode 100644 debian/tcl-vtk8.lintian-overrides delete mode 100644 debian/vtk8-doc.docs delete mode 100644 debian/vtk8-doc.links delete mode 100644 debian/vtk8.install delete mode 100644 debian/vtk8.lintian-overrides create mode 100644 debian/vtk9-doc.docs create mode 100644 debian/vtk9-doc.links rename debian/{vtk8-examples.examples => vtk9-examples.examples} (100%) create mode 100644 debian/vtk9.install diff --git a/debian/changelog b/debian/changelog index a2fd08ba2..bccf3945b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vtk8 (8.2.0+dfsg1-1) UNRELEASED; urgency=medium +vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium [ Gert Wollny ] * Initial release. (Closes: #XXXXXX) diff --git a/debian/control b/debian/control index fcca93ea8..a2fad4b12 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: vtk8 +Source: vtk9 Maintainer: Debian Science Team Uploaders: Anton Gladky , Gert Wollny , @@ -26,6 +26,8 @@ Build-Depends: chrpath, libfreetype6-dev, libfontconfig1-dev, libgdal-dev, + libhpdf-dev, + libogg-dev, libgl1-mesa-dev | libgl-dev, libgl2ps-dev (>= 1.4.0), libglew-dev, @@ -40,9 +42,6 @@ Build-Depends: chrpath, libpng-dev, libpq-dev, libproj-dev, - libqt5opengl5-dev, - libqt5webkit5-dev, - libqt5x11extras5-dev, libsqlite3-dev, libswscale-dev, libtheora-dev, @@ -60,8 +59,6 @@ Build-Depends: chrpath, python3-all-dev, python3-matplotlib, python3-mpi4py, - qtbase5-dev, - qttools5-private-dev, r-base, r-base-core, r-base-dev, @@ -79,11 +76,11 @@ Build-Depends-Indep: doxygen-latex, gnuplot-nox Standards-Version: 4.4.1 Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/science-team/vtk8 -Vcs-Git: https://salsa.debian.org/science-team/vtk8.git +Vcs-Browser: https://salsa.debian.org/science-team/vtk9 +Vcs-Git: https://salsa.debian.org/science-team/vtk9.git Homepage: https://www.vtk.org/ -Package: libvtk8-dev +Package: libvtk9-dev Architecture: any Section: libdevel Depends: default-libmysqlclient-dev, @@ -110,25 +107,24 @@ Depends: default-libmysqlclient-dev, libswscale-dev, libtheora-dev, libtiff-dev, - libvtk8 (= ${binary:Version}), - libvtk8-java (= ${binary:Version}), + libvtk9 (= ${binary:Version}), + libvtk9-java (= ${binary:Version}), libx11-dev, libxft-dev, libxml2-dev, libxss-dev, libxt-dev, mpi-default-dev, - python3-vtk8 (= ${binary:Version}), + python3-vtk9 (= ${binary:Version}), tcl-dev, - tcl-vtk8 (= ${binary:Version}), tk-dev, - vtk8 (= ${binary:Version}), + vtk9 (= ${binary:Version}), x11proto-core-dev, zlib1g-dev, ${misc:Depends}, ${shlibs:Depends} -Suggests: vtk8-doc, - vtk8-examples +Suggests: vtk9-doc, + vtk9-examples Conflicts: libvtk5-dev, libvtk6-dev, libvtk7-dev @@ -142,32 +138,14 @@ Description: VTK header files This package provides the VTK header files required to compile C++ programs that use VTK to do 3D visualisation. -Package: libvtk8-qt-dev -Architecture: any -Section: libdevel -Depends: libvtk8-dev (= ${binary:Version}), - libvtk8-qt (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends}, - qtbase5-dev, - qttools5-private-dev, - libqt5opengl5-dev, - libqt5webkit5-dev -Description: VTK header files, containing Qt files - The Visualization Toolkit (VTK) is an open-source software system - for 3D computer graphics, image processing, and visualization. - . - This package provides the VTK header files required to compile - C++ programs that use VTK to do 3D visualisation. Qt files - -Package: libvtk8 +Package: libvtk9 Architecture: any Section: libs Depends: ${misc:Depends}, ${shlibs:Depends} Suggests: mpi-default-bin, - vtk8-doc, - vtk8-examples + vtk9-doc, + vtk9-examples Replaces: libvtk5.8, libvtk7.1 Description: VTK libraries @@ -177,46 +155,17 @@ Description: VTK libraries This package provides the shared libraries needed to run C++ programs that use VTK. -Package: libvtk8-qt -Architecture: any -Section: libs -Depends: ${misc:Depends}, - ${shlibs:Depends} -Description: VTK libraries, Qt files - The Visualization Toolkit (VTK) is an open-source software system - for 3D computer graphics, image processing, and visualization. - . - This package provides the shared libraries needed to run C++ programs - that use VTK. Qt files - -Package: libvtk8-jni +Package: libvtk9-java Architecture: any Section: java -Depends: ${java:Depends}, - ${misc:Depends}, - ${shlibs:Depends} -Breaks: libvtk6-jni, - libvtk7-jni -Replaces: libvtk6-jni, - libvtk7-jni -Description: VTK - Java Native Interface (JNI) files - The Visualization Toolkit (VTK) is an object oriented, high level - library that allows one to easily write C++ programs, Tcl, Python and - Java scripts that do 3D visualization. - . - This package provides the Java Native Interface files. - -Package: libvtk8-java -Architecture: any -Section: java -Depends: libvtk8-jni (= ${binary:Version}), +Depends: libvtk9-jni (= ${binary:Version}), ${java:Depends}, ${misc:Depends}, ${shlibs:Depends} Suggests: java-virtual-machine, - libvtk8-dev (= ${binary:Version}), - vtk8-doc, - vtk8-examples + libvtk9-dev (= ${binary:Version}), + vtk9-doc, + vtk9-examples Replaces: libvtk6-java, libvtk7-java Breaks: libvtk6-java, @@ -228,18 +177,17 @@ Description: VTK - Java language support . This package provides the VTK Java language support. -Package: python3-vtk8 +Package: python3-vtk9 Architecture: any Section: python -Depends: libvtk8 (= ${binary:Version}), - libvtk8-qt (= ${binary:Version}), +Depends: libvtk9 (= ${binary:Version}), python3-mpi4py, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} Suggests: mayavi2, - vtk8-doc, - vtk8-examples + vtk9-doc, + vtk9-examples Breaks: python3-vtk6, python3-vtk7 Replaces: python3-vtk6, @@ -250,62 +198,44 @@ Description: Python bindings for VTK . This package provides the python3 bindings for VTK. -Package: tcl-vtk8 -Architecture: any -Section: interpreters -Depends: libvtk8 (= ${binary:Version}), - libvtk8-qt (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Suggests: vtk8-doc, - vtk8-examples -Description: Tcl bindings for VTK - The Visualization Toolkit (VTK) is an open-source software system - for 3D computer graphics, image processing, and visualization. - . - This package provides the shared libraries and executable that enable - one to use VTK from Tcl/Tk scripts. - -Package: vtk8 +Package: vtk9 Architecture: any Section: interpreters -Depends: libvtk8 (= ${binary:Version}), +Depends: libvtk9 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Suggests: vtk8-doc, - vtk8-examples -Description: Binaries for VTK8 +Suggests: vtk9-doc, + vtk9-examples +Description: Binaries for VTK9 The Visualization Toolkit (VTK) is an open-source software system for 3D computer graphics, image processing, and visualization. . - This package provides binaries for VTK8 + This package provides binaries for VTK9 -Package: vtk8-doc +Package: vtk9-doc Architecture: all Section: doc Depends: doc-base, libjs-jquery, libjs-mathjax, ${misc:Depends} -Suggests: libvtk8-dev, - vtk8-examples +Suggests: libvtk9-dev, + vtk9-examples Description: VTK class reference documentation The Visualization Toolkit (VTK) is an open-source software system for 3D computer graphics, image processing, and visualization. . - This package provides documentation for VTK8 + This package provides documentation for VTK9 -Package: vtk8-examples +Package: vtk9-examples Architecture: all Depends: ${misc:Depends} -Suggests: libvtk8-dev, +Suggests: libvtk9-dev, python3, - python3-vtk8, - tcl-vtk8, - tclsh, - vtk8-doc + python3-vtk9, + vtk9-doc Description: VTK examples The Visualization Toolkit (VTK) is an open-source software system for 3D computer graphics, image processing, and visualization. . - This package provides examples for VTK8 + This package provides examples for VTK9 diff --git a/debian/libvtk8-dev.install b/debian/libvtk8-dev.install deleted file mode 100644 index 2232adca5..000000000 --- a/debian/libvtk8-dev.install +++ /dev/null @@ -1,21 +0,0 @@ -# add doxygen docs -# to get paraview debian/build properly on top of vtk we now add this as a symlink -# in the python3-vtk8 package -# /usr/lib/*/python3.6/site-packages/vtk/* -CMake/TopologicalSort.cmake usr/lib/cmake/vtk-8.2/ -CMake/vtkGroups.cmake usr/lib/cmake/vtk-8.2/ -CMake/vtkTesting*.cmake usr/lib/cmake/vtk-8.2/ -Common/DataModel/vtkMarchingCubesTriangleCases.h usr/include/vtk-8.2/ -Filters/Statistics/vtkStatisticsAlgorithmPrivate.h usr/include/vtk-8.2/ -IO/Import/vtk3DS.h usr/include/vtk-8.2/ -Testing/Core/vtkTestDriver.h usr/include/vtk-8.2 -Testing/Core/vtkTestUtilities.h usr/include/vtk-8.2/ -Testing/Core/vtkTesting*.h usr/include/vtk-8.2/ -Testing/Rendering/vtkRegressionTestImage.h usr/include/vtk-8.2/ -Testing/Rendering/vtkTesting*.h usr/include/vtk-8.2 -Wrapping/Java/JavaDependencies.cmake.in usr/lib/cmake/vtk-8.2/ -# debian/build/lib/cmake/vtk-8.2/Modules/*-Headers.cmake usr/lib/cmake/vtk-8.2/Modules/ -usr/include/vtk-8.2 usr/include -usr/lib/*/*.so -usr/lib/*/cmake/vtk-8.2 -usr/share/doc/vtk-8.2/doxygen/* /usr/share/vtk-8.2/doxygen/ diff --git a/debian/libvtk8-dev.lintian-overrides b/debian/libvtk8-dev.lintian-overrides deleted file mode 100644 index f3c70f0a1..000000000 --- a/debian/libvtk8-dev.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -libvtk8-dev: shlib-without-versioned-soname -libvtk8-dev: package-name-doesnt-match-sonames -libvtk8-dev: postinst-must-call-ldconfig -libvtk8-dev: hardening-no-relro diff --git a/debian/libvtk8-java.install b/debian/libvtk8-java.install deleted file mode 100644 index 20338ec84..000000000 --- a/debian/libvtk8-java.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/vtkParseJava-8.2 usr/bin -usr/bin/vtkWrapJava-8.2 usr/bin -usr/lib/*/vtk8.jar usr/share/java diff --git a/debian/libvtk8-java.lintian-overrides b/debian/libvtk8-java.lintian-overrides deleted file mode 100644 index 4cc65e88d..000000000 --- a/debian/libvtk8-java.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# Upstream does not provide manpages -libvtk8-java: binary-without-manpage -libvtk8-java: hardening-no-relro diff --git a/debian/libvtk8-jni.lintian-overrides b/debian/libvtk8-jni.lintian-overrides deleted file mode 100644 index 9ef03e659..000000000 --- a/debian/libvtk8-jni.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libvtk8-jni: hardening-no-relro diff --git a/debian/libvtk8-qt-dev.install b/debian/libvtk8-qt-dev.install deleted file mode 100644 index c92ab8cb6..000000000 --- a/debian/libvtk8-qt-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -# remove Python files here and privide a symlink in the python package -# usr/lib/*/python3.6/site-packages/vtk/*Qt* -usr/lib/*/*Qt*.so -# usr/lib/cmake/vtk-8.2/Modules/*Qt* -usr/include/vtk-8.2/*Qt* -usr/include/vtk-8.2/Q* diff --git a/debian/libvtk8-qt-dev.lintian-overrides b/debian/libvtk8-qt-dev.lintian-overrides deleted file mode 100644 index 6c882d930..000000000 --- a/debian/libvtk8-qt-dev.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -libvtk8-qt-dev: shlib-without-versioned-soname -libvtk8-qt-dev: package-name-doesnt-match-sonames -libvtk8-qt-dev: hardening-no-relro - diff --git a/debian/libvtk8-qt.install b/debian/libvtk8-qt.install deleted file mode 100644 index 4c7a2dd85..000000000 --- a/debian/libvtk8-qt.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/*Qt*.so.* diff --git a/debian/libvtk8-qt.lintian-overrides b/debian/libvtk8-qt.lintian-overrides deleted file mode 100644 index 16ad67bf1..000000000 --- a/debian/libvtk8-qt.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -libvtk8-qt: hardening-no-relro -libvtk8-qt: package-name-doesnt-match-sonames - diff --git a/debian/libvtk8.lintian-overrides b/debian/libvtk8.lintian-overrides deleted file mode 100644 index ce3c4246d..000000000 --- a/debian/libvtk8.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -libvtk8: package-name-doesnt-match-sonames -libvtk8: hardening-no-relro -# Will be discussed with upstream to have an opportunity to set USE_SYSTEM_lib - -libvtk8: embedded-library diff --git a/debian/libvtk9-dev.install b/debian/libvtk9-dev.install new file mode 100644 index 000000000..cf1d623ea --- /dev/null +++ b/debian/libvtk9-dev.install @@ -0,0 +1,4 @@ +usr/include/vtk-9.0 usr/include +usr/lib/*/*.so +usr/lib/*/cmake/vtk-9.0 +usr/share/doc/vtk-9.0/doxygen/* /usr/share/vtk-9.0/doxygen/ diff --git a/debian/libvtk9-java.install b/debian/libvtk9-java.install new file mode 100644 index 000000000..015479eab --- /dev/null +++ b/debian/libvtk9-java.install @@ -0,0 +1,4 @@ +usr/bin/vtkParseJava-9.0 usr/bin +usr/bin/vtkWrapJava-9.0 usr/bin +usr/lib/*/java/vtk9.jar usr/share/java +usr/lib/*/java/vtk-L* diff --git a/debian/libvtk8-jni.install b/debian/libvtk9-jni.install similarity index 100% rename from debian/libvtk8-jni.install rename to debian/libvtk9-jni.install diff --git a/debian/libvtk8.install b/debian/libvtk9.install similarity index 100% rename from debian/libvtk8.install rename to debian/libvtk9.install diff --git a/debian/patches/110_do_not_link_against_socket.patch b/debian/patches/110_do_not_link_against_socket.patch index 575840f37..8b4e89f98 100644 --- a/debian/patches/110_do_not_link_against_socket.patch +++ b/debian/patches/110_do_not_link_against_socket.patch @@ -1,8 +1,10 @@ Description: Do not try linking with -lsocket ---- a/Common/System/vtkTestSocketFeatures.cmake -+++ b/Common/System/vtkTestSocketFeatures.cmake -@@ -6,9 +6,6 @@ +Index: VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake +=================================================================== +--- VTK-9.0.1.orig/Common/System/vtkTestSocketFeatures.cmake ++++ VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake +@@ -6,9 +6,6 @@ check_library_exists("socket" getsocknam if(NOT DEFINED VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T) set(VTK_GETSOCKNAME_LIBS) @@ -11,4 +13,4 @@ Description: Do not try linking with -lsocket - endif() message(STATUS "Checking for getsockname with socklen_t") try_compile(VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T_COMPILED - ${VTK_BINARY_DIR}/CMakeTmp/SocklenT + ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/SocklenT diff --git a/debian/patches/30_matplotlib.patch b/debian/patches/30_matplotlib.patch index 6888f1c73..a7a44b25f 100644 --- a/debian/patches/30_matplotlib.patch +++ b/debian/patches/30_matplotlib.patch @@ -1,6 +1,8 @@ ---- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -156,6 +156,10 @@ +Index: VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +=================================================================== +--- VTK-9.0.1.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ VTK-9.0.1/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -151,6 +151,10 @@ private: * to implement IsAvailable. */ static Availability CheckMPLAvailability(); diff --git a/debian/patches/drop_medical_example.patch b/debian/patches/drop_medical_example.patch new file mode 100644 index 000000000..f3a54325e --- /dev/null +++ b/debian/patches/drop_medical_example.patch @@ -0,0 +1,58 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium + . + [ Gert Wollny ] + * Initial release. (Closes: #XXXXXX) + . + [ Drew Parsons ] + * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work + and python3 packaging. + * Drop deprecated patches: + 10_allpatches.patch + 40_use_system_sqlite.patch + - VTK_USE_SYSTEM_SQLITE now available + 60_use_system_mpi4py.patch + - handled by VTK_USE_SYSTEM_MPI4PY + 80_fix_arm_compilation.patch + - Qt5 now builds on arm + 107_gl2ps_1.4.0.patch + 109_use_parallel_hdf5.patch + 111_search_multiarch_paths_for_libproj.patch + . + [ Nico Schlömer ] + * Update to 8.2.0 + * remove obsolete patches, configure options + * rework utf-8 patch + * Update standard to 4.4.1 (no changes) +Author: Johannes Schauer + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: 2020-10-21 + +--- vtk9-9.0.1+dfsg1.orig/Examples/CMakeLists.txt ++++ vtk9-9.0.1+dfsg1/Examples/CMakeLists.txt +@@ -55,7 +55,7 @@ else () + add_example(IO/Cxx) + add_example(ImageProcessing/Cxx) + add_example(Infovis/Cxx) +- add_example(Medical/Cxx) ++ #add_example(Medical/Cxx) + add_example(Modelling/Cxx) + add_example(MultiBlock/Cxx) + add_example(ParallelProcessing/Generic/Cxx) diff --git a/debian/patches/libharu_version.patch b/debian/patches/libharu_version.patch new file mode 100644 index 000000000..58104fb8b --- /dev/null +++ b/debian/patches/libharu_version.patch @@ -0,0 +1,68 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vtk9 (9.0.1+dfsg1-1) UNRELEASED; urgency=medium + . + [ Gert Wollny ] + * Initial release. (Closes: #XXXXXX) + . + [ Drew Parsons ] + * Thanks: Nico Schloemer, Johannes Schauer and Gert for initial work + and python3 packaging. + * Drop deprecated patches: + 10_allpatches.patch + 40_use_system_sqlite.patch + - VTK_USE_SYSTEM_SQLITE now available + 60_use_system_mpi4py.patch + - handled by VTK_USE_SYSTEM_MPI4PY + 80_fix_arm_compilation.patch + - Qt5 now builds on arm + 107_gl2ps_1.4.0.patch + 109_use_parallel_hdf5.patch + 111_search_multiarch_paths_for_libproj.patch + . + [ Nico Schlömer ] + * Update to 8.2.0 + * remove obsolete patches, configure options + * rework utf-8 patch + * Update standard to 4.4.1 (no changes) +Author: Johannes Schauer + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: 2020-10-22 + +Index: VTK-9.0.1/ThirdParty/libharu/CMakeLists.txt +=================================================================== +--- VTK-9.0.1.orig/ThirdParty/libharu/CMakeLists.txt ++++ VTK-9.0.1/ThirdParty/libharu/CMakeLists.txt +@@ -1,14 +1,14 @@ + vtk_module_third_party( + INTERNAL + LICENSE_FILES "vtklibharu/LICENCE" +- VERSION "2.4.0" ++ VERSION "2.3.0" + STANDARD_INCLUDE_DIRS + EXTERNAL + PACKAGE LibHaru + # Unreleased. Requires these PRs: + # https://github.com/libharu/libharu/pull/157 + # https://github.com/libharu/libharu/pull/187 +- VERSION 2.4.0 ++ VERSION 2.3.0 + TARGETS LibHaru::LibHaru + STANDARD_INCLUDE_DIRS) + diff --git a/debian/patches/series b/debian/patches/series index f346ea3c7..890976963 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,12 @@ -20_soversion-sharedlib.patch +#20_soversion-sharedlib.patch 30_matplotlib.patch -50_use_system_utf8.patch -60_remove_mpi4py_dependency.patch -70_fix_ftbfs_gcc49.patch -100_javac-heap.patch -101_java_install_path.patch -105_unforce_embedded_glew.patch -106_install_doxygen_scripts_in_nodoc_build.patch -108_Doxygen-use-mathjax.patch +#50_use_system_utf8.patch +#60_remove_mpi4py_dependency.patch +#70_fix_ftbfs_gcc49.patch +#100_javac-heap.patch +#101_java_install_path.patch +#105_unforce_embedded_glew.patch +#106_install_doxygen_scripts_in_nodoc_build.patch +#108_Doxygen-use-mathjax.patch 110_do_not_link_against_socket.patch +drop_medical_example.patch diff --git a/debian/python3-vtk8.lintian-overrides b/debian/python3-vtk8.lintian-overrides deleted file mode 100644 index f7f17ea85..000000000 --- a/debian/python3-vtk8.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# Upstream does not provide manpages -python3-vtk8: binary-without-manpage -python3-vtk8: binary-or-shlib-defines-rpath -python3-vtk8: hardening-no-relro diff --git a/debian/python3-vtk8.install b/debian/python3-vtk9.install similarity index 100% rename from debian/python3-vtk8.install rename to debian/python3-vtk9.install diff --git a/debian/rules b/debian/rules index bda311711..e949fb4f3 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,6 @@ else BUILDDOC = ON endif -# export JAVA_HOME to help FindJava.cmake and FindJNI.cmake export JAVA_HOME=/usr/lib/jvm/default-java %: @@ -21,52 +20,39 @@ extra_flags += \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_C_COMPILER=mpicc \ -DCMAKE_CXX_COMPILER=mpic++ \ - -DBUILD_DOCUMENTATION=$(BUILDDOC) \ - -DBUILD_EXAMPLES=ON \ + -DVTK_BUILD_DOCUMENTATION=$(BUILDDOC) \ + -DVTK_BUILD_EXAMPLES=OFF \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_TESTING=OFF \ + -DVTK_BUILD_TESTING=OFF \ -DVTK_USE_TK=ON \ - \ -DVTK_WRAP_JAVA=ON \ -DVTK_WRAP_PYTHON=ON \ - -DVTK_PYTHON_VERSION:STRING=3 \ - \ - -DVTK_USE_SYSTEM_DOUBLECONVERSION=ON \ - -DVTK_USE_SYSTEM_EIGEN=ON \ - -DVTK_USE_SYSTEM_EXPAT=ON \ - -DVTK_USE_SYSTEM_FREETYPE=ON \ - -DVTK_USE_SYSTEM_GL2PS=ON \ - -DVTK_USE_SYSTEM_GLEW=ON \ - -DVTK_USE_SYSTEM_HDF5=ON \ - -DHDF5_PREFER_PARALLEL=ON \ - -DVTK_USE_SYSTEM_JPEG=ON \ - -DVTK_USE_SYSTEM_JSONCPP=ON \ - -DVTK_USE_SYSTEM_LIBPROJ=ON \ - -DVTK_USE_SYSTEM_LIBXML2=ON \ - -DVTK_USE_SYSTEM_LZ4=ON \ - -DVTK_USE_SYSTEM_LZMA=ON \ - -DVTK_USE_SYSTEM_MPI4PY=ON \ - -DVTK_USE_SYSTEM_NETCDF=ON \ - -DVTK_USE_SYSTEM_PNG=ON \ - -DVTK_USE_SYSTEM_SQLITE=ON \ - -DVTK_USE_SYSTEM_TIFF=ON \ - -DVTK_USE_SYSTEM_XDMF3=ON \ - -DVTK_USE_SYSTEM_ZLIB=ON \ - \ + -DHDF5_IS_PARALLEL=OFF \ + -DVTK_MODULE_USE_EXTERNAL_VTK_eigen:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_expat:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_glew:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_jpeg:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_libproj:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_lz4:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_lzma:BOOL:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_ogg:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_png:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_theora:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion:BOOL=ON \ + -DVTK_PYTHON_VERSION:STRING=3 \ -DVTK_EXTRA_COMPILER_WARNINGS=ON \ - -DVTK_Group_Imaging=ON \ - -DVTK_Group_MPI=ON \ - -DVTK_Group_Tk=ON \ - -DVTK_Group_Views=ON \ - -DMPI_CXX_INCLUDE_PATH="/usr/include/mpi" \ - -DVTK_INSTALL_LIBRARY_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \ - -DModule_vtkRenderingExternal=ON \ - -DModule_vtkAcceleratorsVTKm=OFF - -extra_flags += -DVTK_QT_VERSION=5 -DVTK_Group_Qt=ON + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" override_dh_auto_configure: ifneq (,$(filter $(DEB_HOST_ARCH),$(noqt_archs))) @@ -97,23 +83,14 @@ override_dh_auto_install: # Modify vtkWrapJava.cmake to properly upload JavaDependencies.cmake.in from $VTK_DIR perl -pi -e "s|{dir}/JavaDependencies.cmake.in\"|{VTK_DIR}/JavaDependencies.cmake.in\"|" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-8.2/vtkWrapJava.cmake # Correct headers for paraview - mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk8.jar - mv $(CURDIR)/debian/build/bin/vtkpython $(CURDIR)/debian/build/bin/vtk8python - sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-8.2/VTKTargets.cmake - chrpath -d $(CURDIR)/debian/build/bin/vtk8python - # chrpath -d $(CURDIR)/debian/build/bin/pvtk - chrpath -d $(CURDIR)/debian/build/bin/pvtkpython - # mv $(CURDIR)/debian/tmp/usr/bin/vtk $(CURDIR)/debian/tmp/usr/bin/vtk8 + mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar + mv $(CURDIR)/debian/build/bin/vtkpython $(CURDIR)/debian/build/bin/vtk9python + sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake + chrpath -d $(CURDIR)/debian/build/bin/vtk9python + find $(CURDIR)/debian/tmp/ -name "*.pyc" | xargs rm -f find $(CURDIR)/debian/tmp/ -name "*.pyo" | xargs rm -f override_dh_install-arch: dh_install -a - find $(CURDIR)/debian/libvtk8-dev/ -name "*Qt*" -exec rm {} \; - find $(CURDIR)/debian/libvtk8/ -name "*Qt*" -exec rm {} \; - find $(CURDIR)/debian/libvtk8-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; - find $(CURDIR)/debian/libvtk8-dev/usr/include/ -name "Q*" -exec rm {} \; - # chmod 755 $(CURDIR)/debian/libvtk8-dev/usr/share/doc/vtk-8.2/doxygen/*.pl - # mkdir -p $(CURDIR)/debian/python3-vtk8/usr/lib/$(DEB_HOST_MULTIARCH)/python3.7/site-packages/ && \ - # cd $(CURDIR)/debian/python3-vtk8/usr/lib/$(DEB_HOST_MULTIARCH)/python3.7/site-packages/ && \ - # ln -s /usr/lib/python3/dist-packages/vtk vtk + find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; diff --git a/debian/tcl-vtk8.install b/debian/tcl-vtk8.install deleted file mode 100644 index acfa33795..000000000 --- a/debian/tcl-vtk8.install +++ /dev/null @@ -1,3 +0,0 @@ -# usr/bin/vtkWrapTcl-8.2 -# usr/bin/vtkWrapTclInit-8.2 -# usr/lib/tcltk diff --git a/debian/tcl-vtk8.lintian-overrides b/debian/tcl-vtk8.lintian-overrides deleted file mode 100644 index 572112c43..000000000 --- a/debian/tcl-vtk8.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# Upstream does not provide manpages -tcl-vtk8: binary-without-manpage -tcl-vtk8: hardening-no-relro diff --git a/debian/tests/control b/debian/tests/control index bdca94cad..98d629557 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: buildBoolean buildPoint buildVTU buildDistance buildPNG buildVTP -Depends: libvtk8-dev, build-essential, cmake +Depends: libvtk9-dev, build-essential, cmake Restrictions: allow-stderr diff --git a/debian/vtk8-doc.docs b/debian/vtk8-doc.docs deleted file mode 100644 index 7d47f2e43..000000000 --- a/debian/vtk8-doc.docs +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/doc/vtk-8.2/doxygen -debian/build/Utilities/Doxygen/doc/html diff --git a/debian/vtk8-doc.links b/debian/vtk8-doc.links deleted file mode 100644 index 36ad317a5..000000000 --- a/debian/vtk8-doc.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/javascript/jquery/jquery.js usr/share/doc/vtk8-doc/html/jquery.js diff --git a/debian/vtk8.install b/debian/vtk8.install deleted file mode 100644 index d2cc2cb54..000000000 --- a/debian/vtk8.install +++ /dev/null @@ -1,3 +0,0 @@ -# usr/bin/vtk8 -# usr/bin/vtkEncodeString-8.2 -usr/bin/vtkWrapHierarchy-8.2 diff --git a/debian/vtk8.lintian-overrides b/debian/vtk8.lintian-overrides deleted file mode 100644 index fa7987b97..000000000 --- a/debian/vtk8.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# Upstream does not provide manpages -vtk8: binary-without-manpage -vtk8: hardening-no-relro diff --git a/debian/vtk9-doc.docs b/debian/vtk9-doc.docs new file mode 100644 index 000000000..dba89dfb0 --- /dev/null +++ b/debian/vtk9-doc.docs @@ -0,0 +1,2 @@ +debian/tmp/usr/share/doc/vtk-9.0/doxygen +debian/build/Utilities/Doxygen/doc/html diff --git a/debian/vtk9-doc.links b/debian/vtk9-doc.links new file mode 100644 index 000000000..f7b2e7314 --- /dev/null +++ b/debian/vtk9-doc.links @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.js usr/share/doc/vtk9-doc/html/jquery.js diff --git a/debian/vtk8-examples.examples b/debian/vtk9-examples.examples similarity index 100% rename from debian/vtk8-examples.examples rename to debian/vtk9-examples.examples diff --git a/debian/vtk9.install b/debian/vtk9.install new file mode 100644 index 000000000..e2f93ce43 --- /dev/null +++ b/debian/vtk9.install @@ -0,0 +1 @@ +usr/bin/vtkWrapHierarchy-9.0 -- 2.30.2